merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 30 Aug 2010 00:15:54 +0000 (09:15 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 30 Aug 2010 00:15:54 +0000 (09:15 +0900)

Trivial merge